minor changes to bring us more inline with proper r73