master Minor improvements