Fixed DB problems