schema name various issues fix