Fixed loose ends from last commit