Minor Fixes #2