Small fixes in neo