Base: Fix minor bugs including useless reloads