Fixed a couple bugs introduced in 5.3.4