Misc bug fix + braviafySubs