Fixed X Bugs