Fix for update functions