Fixed some build problems due to removal of thumb