fixes for our updated libraries