More constraints and fixes for wait(Event). Also disabled MULTICORE by DEFAULT.