Bug fix setting the default cpu and memory values too late