Edited fixes 2