Fixes because of the updated DB