Updates for stability and bug fixing