Fixes for building developement snapshot