Minor fixes, such as s/block/object