Fix non-essential issues