Minor fixes to conditional compilation for Mega2560