Fixed compile errors for non-remote build