Fixes

+ Minor bugs Fixes