Fixed newly introduced bugs.