Fix some errors in previous commit