Fixxed references to resources