Small fix of bad stuff