Small fixes
Installation fixes