Update assembly bundles + minor improvements