Fix #31 Several backend issues