fixes for backwards compatability