fix return values for support methods