Minor bug fixes for run2 geometry