Fix a couple of errors
Fix a couple other of errors