Fix manifest functions