Fixes to finish out the following tickets: 930, 917, 716