Fixes coming in for some remaining issues