Varios cleanups, added patches, fixes