Fixes found in testing