Minor setup issues...