Some fixes from the platform