Some promise improvements