Fix mutliple issues