Add topic patch
Fix miscellaneous