More fixes

Based on feedback from @singingwolfboy and @cpennington