Fix Eclipse Day Presentation bugs related to newer core version