A few minor fixes, also #261