Fxed DB screwups