Increment Version and Fix Build Erros