Fixing some timing layouts