Fixing two recently introduced bugs.