Updated misc fixes