New bug fixes (5.0 Alpha)