solved compilation problems due to minor bugs
Merged with master