Fix some cat gameplay bugs