Remove incomplete pattern
Fix compiler warnings