Updated deprecated stuff.
Fixed architectures etc.