Small fixes to comply with updated code
Merge remote-tracking branch 'origin/master'