Added RPM workarounds