Fix some adventure bugs