Fix Various Code