Gii codestyle fixes