more places that have to be marked safe (fixes #118)