Minor fixes, restoring what I removed