assign fixes, cleanups