APT. 407: [250530] Minor bug fixes

Minor bug fixes