Further testing and related fixes