Removed several warnings