Minor code fixes

Minor fixes-Update to last LS version on next cycle