Adds fixes found in testing