minor fixes and improvements for lamina common 1.1