Fix some mixups + update