fix(stuff): Various fixes