PR fixes, other improvements