@SuppressWarnings fixes