Small fixes may be applied