Bug Fixes due to new library BaseLibS

Bug Fixes due to new library BaseLibS