Merge "fixed some minor annoyances that made integration harder"