Resolve some TODO items
FileLoader: fix corner case for updating the buffer properties