minor improvements for compatability with extensions that I will be making