Adding some more fixmes