Some bean changes for stability purposes