Minor touchups fixes #1