Additional fixes and refinements