Miscellaneous fixes on master barang