Fixes more stuff for Promises