Minor non-essential fixes