More Fixes #76