fix: Various fixes