Fixing specs bugs