Fixed some buglets