Changes from previous commit for multiple platforms