Start fixing up specs