Corrected errors in commits aca26b4 and 5807684.