Fixed compile errors in Master