[#311] Some minor fixes