Fixes for errors.