Fixed some spec references, fixed usage of call to invoke then