Fixes. Loading and update system