Fixes for parameter and metadata injection