Some minor changes to sqeeze the bugs