Fixed OS specific loading