Fixes for install