More build fixes for OS X

Change-Id: I55a8d4e50d77ff1f11f471931e5ad959f2e946c6
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>