Bug fixes and improvements with open source compatibility
Many things to bradq for reporting bugs.