Improves some functions