Minor improvements spec