Fixing final few specs. Mostly caused by schema inconsistencies