fix semantic issues
Merge remote-tracking branch 'anca/master'