Fix some issues in setup file