Fixed some spec features