Maintenance update and minor fixes