Fixed: A few more bugs on the path to glory.