Added other fixes