some more fixes for terribly broken quoting