Just some code fixes -_-