Fixes for building rpm

Add some TODOs.