Test from Eclipse + Small fixes