Fixed issues with invalid architecture.