Fixes from platform update