Fix return types on database support