Fixed minor issues with setup