Resolved future issues