Reverted wrong fix and fixed manifest