Faster config injection + fixes