extract bundled specs to a separate file
fix another typo
fix further compilation issues in dependant repositories