Final fixes, removed Ink for release