Added useful fixmes