Fix several scanning-related effects