Expert mode tweaks