Fix for too few values in struct initializer, and others

This PR should address issue #1