fixes for multisite option fringe cases.