[N/A] Some minor bug fixes

Reviewed by N/A