Multiple fixes that I forgot to commit