Fixes for installation issue