Fixes for auto reload