Small fixes for bluebird generics