Fix ambiguity in KGW patch, fix indentation