Misc. pair programming fixes