Minor platform updates and tests fixes