Fix to use server defaults