Specs: Fixes for dynamic loading