Small fixes for certain platforms