Build stuff fixing