Fix possible NPE in AspectContainer, improve TT compatibility (thanks nekosune)