Fixed outdated bugs