Fixes based on first real build.