[~] Fix small things