Cleannup fixes #76