Removed warning
Some fixes