Fix some small items