Fix some regex for the handlers (re #87)