Fix build and derps