Server-side: liquibase and small fix