view and scheduler fixes