fix some cleanup issues
fix action vs label override issue for rb299