- Comments for future fixes