Pulled latest nimbus fixes