more ifdef fixes