Fix basic code issues in controlloop