Little Bug Fixes from the dexter branch