Fixed some buggy expansions