Add more version and platform checks