Fixed signatures on all of the classes.