Fixes and specs