small fixes, tested and working for btx-o2-so4