Fixes for installation