Fixes for new Janus databse format