small changes due to some problem with the db schemas