Some various tiny changes

Just needed to commit to change branches