bug fixes found in testing on VM