Some minor fixes, closes #43 and closes #44