missed couple of xavia refs
fix deprecated options