Bug Fixes mainly involving returned object type