Fix first time bugs