[GEOT-4843], first batch of fixes based on Jody's feedback