Fixed timing issues in Sapphire