Cleanup of corrections for MagnetoDB project

Change-Id: I57f401f5d80b98395612a029d3ce7f235737a5f1