Add nopython to function environment
Fix up some references