Made the small fixes cross-platform