[1.3] Bug fixes