Clean up 'Base'
Remove misnamed block parameter in 'Addresses'
Remove misnamed block parameter in 'Images'