small fixes for cloaking