Minor changes in catwm.c