(chore): various fixes