Fix some buggy bugz