Various fixes added