Numerous minor bug fixes