Bug fixes for grid changes b8a16bbd5a. directory bug remains