CS fixes on imported exceptions