Fix: Other 'dist' related improvements