oldway.cpp: minor bugfixes