Some more fixes to #294