Small adjustments to make everything work with the recent setup at home