Fixed mounting issues