Fixxed some issues