More bug fixes :D