misc updates to make compatable