More fixes

- Addition fixes for #3
- Fix for #5