regexp + setup fixes