Fixed loose ends