Slight resource optimization changes