Fixes to few spec tests