Slightly unbreak stuff