Fix some (hopefully) final issues