Various fixes

Same as above regexp