Fixing some errors
Some fixes