Example bug fixes