More stuff to commit that I missed