Found a bug in GenreDAO + other fixes