Fix build issues. Hopefully on all platforms?