Fix array resolution & CS fixes