Level One geometry fixes;