Button and timing fixes