More buff control and fix buff loading