Fix first-frame setup