Fix & optimized last exports