Bugfixes

Made initial fixes to 2703 and 2707.  Both could use a little further cleaning up in develop