Converted more cats and prints to messages and warnings