Misc minor fix