Minor bMinor bug fixes