Fixed issues with mounting