Build fixes for non-Windows