A few fixes :D