fix return type errors