Last fixes I hope :D