Improve/fix compilation switches