operational fixes