Minor Changes

Initial bug fixes
Fixed bug caused by change