Added a few final changes I forgot to commit