Minor resource IDs cleanup