fix compile errors
Merge remote-tracking branch 'artForz/dev' into dev