Minor improvements/fixes