Some basic updates/fixes