Fix some error found by Wishbringer