More rpm related tweaks