General updates and fixes