Fix mixed tab / space, remove FIXME