Fix #53 among other tiny things