More little fixes :X: