Xplanet - fixing optional dependency conditionals