Fixes to include assembly dependencies on packaging