Multiple smaller fixes