Some fixes for PC/Mac stuff