Removed compiler warnings
Make several configs configurable