Minor fixes + adds