Bug fixes (internal and self transitions)