Various bug fixes for signal checking