Fix some minor issues
Remove language selection