Resub fixes