Specs, small fixes