Fixing things @ajpiano told me about