Fixed some errors in previous commits