Fix code
Fix specs