some minor changes to ifdef switches to try something...