FIX: Some failing specs