Couple fixes

Not the most cohesive PR ever, but :feelsgood: