Fixes on methods and exceptions that were not  used