Fix minor mistakes, return code lost during merge