Fix cat/code active issues