Bug fixes
Changes in api acceptor and development-mode