Made platform checks more consistent.
Made Apache MSI hack more obvious.