General updates and fixes from 2013