Fixes

Fixed build issues in eclipse.