Fixed Issues with code VS db