More bug fixes :O