Fixed some kitten problems