Small fixes
boolean code style