276 release fixes

fixes #276 
fixes #274