Various small changes
Made some internal helper methods protected