Some fixes, w i p atm