Fix some bugz!