Some updates for x230