Revert a stupid suggestion that slipped through, and a small fix