Small fixes
Closed #43