Fix some errors

Fix some errors