MInor Bug Fixes