[1.2.4] Bug Fixes