APT. 407: [250530] Minor Bux fixes

Minor Bux fixes