Small changes to make the main library #load friendly.