Fix some links and conditionals