Better handling of signals