Added "Other bug fixes and tweaks"