Handle aliases sections, fix a bug