More bug squashing :D