Code review fixmes