Fixed stability and regex issues