Fix issues with capability after some thorough testing.