glw: Fix some recently introduced bugs