minor fixes/maintenance