Code fixes

Code fixes