Build against the latest Citizens,fix some errors

+ increment to '1.5.4' to clearly identify that there is a needed change