Minifixes
Merge branch 'perfield-errors'