Generic Service: uncommented some necessary lines and other small fixes