api and config change fixes