Fixes for distribution