Some final fixes from my machine