Minor fixes. Still need to fix aspect NAs.