F/fix setup

This PR fixes the installation problems.