Fixed some CustomStack-related problems
Fixed some CustomStack-related problems