Updates for new target platform