Minor Fixes #1