opt: Optimized some little features.