Some minor setup issues