Various crate behavior changes; Some etc.