Bug Fixes

Started going through the outstanding bug listings - User submitted
fixes