Minor Changes to fix current.