Fixed rendering for some platform combinations