Rule updates / fixed compilation issues