Finishing work on several issues