More spec fixin