Fix some buglets