Fixed matching compilation issues