Major fixes according to the suggestions from Bioconductor