Minor cleanup, fix version requirements