Various fixes to correlate rules properly from the build
Properly handle inheriting styles with correlated built rules