Bug fixes: build fix