- Linux build fix
- Fixed some small stuffs