Removed some warnings
Components improvements