A few key fixes