Bug fixes

FIxed some changes related to true/false