Fixes, DO NOT BUILD NOT READY