More bug fixes :)