Activate Basal Working

Minor bug fix validity checks.