[master] Fixed compile errors