Reverted back selected changes after reviewing rules@03898ff and rules@2ed9b98 + small other fixes
Less verbose cmake is enough