Fix mount changes and build