Improve conditional compilation