Fixed a couple of compile errors and a bug in BaseDAO