Fix issue where common won't be required if os is detected