- Minor cleanup issues