Few changes to maybe help with errors.