Temp changes for shamu (phone FC fixes)