Minor Bug fixes, ready for release