Fixes for various packages