Temporary patches to make local db more functional