Fix more issues mentioned in #10