Start fixing specs