More small fixes based on review comments in #140