[1.2.5] Bug fixes