Fix bugs introduced during last update.