Initial run-through bug fixes