Fixes and style conformity changes