Resource fixes