Issue resolution, small other stuff