fixing leftover errors from the last merge