Fixes for install target