small fixes for Glenn's workshop