Mutliple fixes