Fix #2 - Increased warnings