Fix wrong include paths
Fix incorrect handler invocation