More cloaking module modifications