Cleaned up eclipse warnings