[1.2.3] Bug fixes.