Trying to fix remaining errors